From 84bd32a09a25bee24ae7740e30bd75727695d744 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 15 Aug 2015 22:02:40 -0400 Subject: [PATCH] popover: Optimize the transition There's no need to queue a resize here. https://bugzilla.gnome.org/show_bug.cgi?id=753568 --- gtk/gtkpopover.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c index e7f3e69499..67697751de 100644 --- a/gtk/gtkpopover.c +++ b/gtk/gtkpopover.c @@ -518,8 +518,6 @@ show_animate_cb (GtkWidget *widget, gtk_widget_set_opacity (widget, 1.0 - t); } - gtk_widget_queue_resize (GTK_WIDGET (popover)); - if (t >= 1.0) { if (priv->state == STATE_SHOWING) @@ -532,10 +530,10 @@ show_animate_cb (GtkWidget *widget, else gtk_popover_set_state (popover, STATE_HIDDEN); - return FALSE; + return G_SOURCE_REMOVE; } else - return TRUE; + return G_SOURCE_CONTINUE; } static void @@ -575,7 +573,7 @@ gtk_popover_set_state (GtkPopover *popover, gtk_popover_start_transition (popover); else { - if (priv->tick_id) + if (priv->tick_id != 0) { gtk_widget_remove_tick_callback (GTK_WIDGET (popover), priv->tick_id); priv->tick_id = 0; -- 2.30.2